Worked around bug in google XML encoding

diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c
index c8ace7244c0d4def231660419f110069b4b74704..11cd0f72d5f1e83ab7ee648f1e06116db7646869 100644 (file)
--- a/gpsbabel/geo.c
+++ b/gpsbabel/geo.c
@@ -133,7 +133,7 @@ void wpt_coord(const char *args, const char **attrv)
 void
 geo_rd_init(const char *fname)
 {
-       xml_init(fname, loc_map);
+       xml_init(fname, loc_map, NULL);
 }
 
 void

diff --git a/gpsbabel/glogbook.c b/gpsbabel/glogbook.c
index 3fe98162d5d1d77349e494f9a48057e576ba5194..b4f59938ce973c51b7c7dd4e03c4b537e03bb69d 100644 (file)
--- a/gpsbabel/glogbook.c
+++ b/gpsbabel/glogbook.c
@@ -57,7 +57,7 @@ static xg_tag_mapping gl_map[] = {
 void
 glogbook_rd_init(const char *fname)
 {
-       xml_init(fname, gl_map);
+       xml_init(fname, gl_map, NULL);
 }
 
 void

diff --git a/gpsbabel/google.c b/gpsbabel/google.c
index 200f3d215f8d90c879de28602d5dd1d83a62b86a..cbaa5b93562b135e209c983c30ecb20647cf7195 100644 (file)
--- a/gpsbabel/google.c
+++ b/gpsbabel/google.c
@@ -167,7 +167,7 @@ void goog_poly_e( const char *args, const char **unused )
 void
 google_rd_init(const char *fname)
 {
-       xml_init(fname, google_map);
+       xml_init(fname, google_map, "ISO-8859-1" );
 }
 
 void
@@ -184,7 +184,7 @@ google_read(void)
                        if ( end ) {
                                *end = '\0';
                                xml_deinit();
-                               xml_init( NULL, google_map );
+                               xml_init( NULL, google_map, NULL );
                                xml_readstring( xml );
                        }
                }

diff --git a/gpsbabel/hiketech.c b/gpsbabel/hiketech.c
index b95828246c540636813aff3d960a4f8035b035e2..5e933247c896ffe7c040ee3002a61afab30bda06 100644 (file)
--- a/gpsbabel/hiketech.c
+++ b/gpsbabel/hiketech.c
@@ -76,7 +76,7 @@ static xg_tag_mapping ht_map[] = {
 void
 hiketech_rd_init(const char *fname)
 {
-       xml_init(fname, ht_map);
+       xml_init(fname, ht_map, NULL);
 }
 
 void

diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c
index d7c5fa35667f9308c0837e92009b08381a8e83e0..c4eea6765ea3a172c3fcf0e4ba9faca09935692c 100644 (file)
--- a/gpsbabel/kml.c
+++ b/gpsbabel/kml.c
@@ -139,7 +139,7 @@ static
 void
 kml_rd_init(const char *fname)
 {
-       xml_init(fname, kml_map);
+       xml_init(fname, kml_map, NULL);
 }
 
 static

diff --git a/gpsbabel/tef_xml.c b/gpsbabel/tef_xml.c
index a5e2ac624a781a0378e40221ecc7f5d57ad84e15..885e2d484d082e1dabd0e24d8cbe577d900fd9f1 100644 (file)
--- a/gpsbabel/tef_xml.c
+++ b/gpsbabel/tef_xml.c
@@ -269,7 +269,7 @@ tef_point(const char *args, const char **attrv)
 static void 
 tef_xml_rd_init(const char *fname)
 {
-       xml_init(fname, tef_xml_map);
+       xml_init(fname, tef_xml_map, NULL);
 }
 
 /*

diff --git a/gpsbabel/xmlgeneric.c b/gpsbabel/xmlgeneric.c
index 9aaf231734e0b382e45bfc6aa9629e4f4198cb64..9ba56770b830785245245dd22951d1e90529286e 100644 (file)
--- a/gpsbabel/xmlgeneric.c
+++ b/gpsbabel/xmlgeneric.c
@@ -232,7 +232,7 @@ void xml_readstring( char *str )
 }
 
 void
-xml_init(const char *fname, xg_tag_mapping *tbl)
+xml_init(const char *fname, xg_tag_mapping *tbl, const char *encoding)
 {
        if (fname) {
                ifd = xfopen(fname, "r", MYNAME);
@@ -241,7 +241,7 @@ xml_init(const char *fname, xg_tag_mapping *tbl)
        current_tag = vmem_alloc(1,0);
        *((char *)current_tag.mem) = '\0';
 
-       psr = XML_ParserCreate(NULL);
+       psr = XML_ParserCreate((const XML_Char *)encoding);
        if (!psr) {
                fatal(MYNAME ": Cannot create XML Parser\n");
        }

diff --git a/gpsbabel/xmlgeneric.h b/gpsbabel/xmlgeneric.h
index 35758b0125d9d90983e0cdfb6caef7181ce9a4ad..1042766c2a8121b7b7e64a96643c67c108b78b68 100644 (file)
--- a/gpsbabel/xmlgeneric.h
+++ b/gpsbabel/xmlgeneric.h
@@ -54,7 +54,7 @@ void xml_fill_in_time(char *time_string, const time_t timep,
                int long_or_short);
 void write_xml_header(FILE *ofd);
 
-void xml_init(const char *fname, xg_tag_mapping *tbl);
+void xml_init(const char *fname, xg_tag_mapping *tbl,const char *encoding);
 void xml_read(void);
 void xml_readstring(char *str);
 void xml_deinit(void);